assert ref_count>0.

Wed Jan 27 09:19:07 1999  Tim Janik  <timj@gtk.org>

        * gdk/gdkcolor.c (gdk_colormap_unref): assert ref_count>0.

diff --git a/ChangeLog b/ChangeLog
index 0735e4c659e7b54c91ee254a5a25c85a111c5bbb..dfe5b34ce18a5ccb9df810916a39a696dbdfc981 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 27 09:19:07 1999  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdkcolor.c (gdk_colormap_unref): assert ref_count>0.
+
 Mon Jan 25 20:05:22 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_set_{visual,colormap}): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0735e4c659e7b54c91ee254a5a25c85a111c5bbb..dfe5b34ce18a5ccb9df810916a39a696dbdfc981 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Wed Jan 27 09:19:07 1999  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdkcolor.c (gdk_colormap_unref): assert ref_count>0.
+
 Mon Jan 25 20:05:22 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_set_{visual,colormap}): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0735e4c659e7b54c91ee254a5a25c85a111c5bbb..dfe5b34ce18a5ccb9df810916a39a696dbdfc981 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Wed Jan 27 09:19:07 1999  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdkcolor.c (gdk_colormap_unref): assert ref_count>0.
+
 Mon Jan 25 20:05:22 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_set_{visual,colormap}): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0735e4c659e7b54c91ee254a5a25c85a111c5bbb..dfe5b34ce18a5ccb9df810916a39a696dbdfc981 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Wed Jan 27 09:19:07 1999  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdkcolor.c (gdk_colormap_unref): assert ref_count>0.
+
 Mon Jan 25 20:05:22 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_set_{visual,colormap}): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0735e4c659e7b54c91ee254a5a25c85a111c5bbb..dfe5b34ce18a5ccb9df810916a39a696dbdfc981 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Wed Jan 27 09:19:07 1999  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdkcolor.c (gdk_colormap_unref): assert ref_count>0.
+
 Mon Jan 25 20:05:22 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_set_{visual,colormap}): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0735e4c659e7b54c91ee254a5a25c85a111c5bbb..dfe5b34ce18a5ccb9df810916a39a696dbdfc981 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Wed Jan 27 09:19:07 1999  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdkcolor.c (gdk_colormap_unref): assert ref_count>0.
+
 Mon Jan 25 20:05:22 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_set_{visual,colormap}): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0735e4c659e7b54c91ee254a5a25c85a111c5bbb..dfe5b34ce18a5ccb9df810916a39a696dbdfc981 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Wed Jan 27 09:19:07 1999  Tim Janik  <timj@gtk.org>
+
+       * gdk/gdkcolor.c (gdk_colormap_unref): assert ref_count>0.
+
 Mon Jan 25 20:05:22 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_set_{visual,colormap}): 

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 41f6286de7f4dafc7d3d3134df1df7bcc4a52ac7..065d3f12664d0e8bdc4835a55e00ff3dc6b213f7 100644 (file)
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -162,6 +162,7 @@ GdkColormap*
 gdk_colormap_ref (GdkColormap *cmap)
 {
   GdkColormapPrivate *private = (GdkColormapPrivate *)cmap;
+
   g_return_val_if_fail (cmap != NULL, NULL);
 
   private->ref_count += 1;
@@ -172,7 +173,9 @@ void
 gdk_colormap_unref (GdkColormap *cmap)
 {
   GdkColormapPrivate *private = (GdkColormapPrivate *)cmap;
+
   g_return_if_fail (cmap != NULL);
+  g_return_if_fail (private->ref_count > 0);
 
   private->ref_count -= 1;
   if (private->ref_count == 0)

diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 41f6286de7f4dafc7d3d3134df1df7bcc4a52ac7..065d3f12664d0e8bdc4835a55e00ff3dc6b213f7 100644 (file)
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -162,6 +162,7 @@ GdkColormap*
 gdk_colormap_ref (GdkColormap *cmap)
 {
   GdkColormapPrivate *private = (GdkColormapPrivate *)cmap;
+
   g_return_val_if_fail (cmap != NULL, NULL);
 
   private->ref_count += 1;
@@ -172,7 +173,9 @@ void
 gdk_colormap_unref (GdkColormap *cmap)
 {
   GdkColormapPrivate *private = (GdkColormapPrivate *)cmap;
+
   g_return_if_fail (cmap != NULL);
+  g_return_if_fail (private->ref_count > 0);
 
   private->ref_count -= 1;
   if (private->ref_count == 0)